change commitData list of callModel to set, add final to some classes