Adding support for ember. Will switch to new branch