Added more GP functions and types