Remove need for reflection