change Feature stubs to Feature instances