Added Ember. Renaming APIs