changes to support last ember version