Adding type as dynamic parameter
Cleaning up unused overrides