Update type and param helper functions and templates