Changed return value

Return value changed to IEntity on true