API: (bug 11405) Expand templates implementation in the API