Minor changes to controllers and GroupedAPI to fulfill new design decisions