Adding full return for enyo models