Changing from id to instancetype