Modify to get to allow autoinvokables