Controller fixes, TypesHolder parameter is now required