Changed domain for composition models
Fixed few errors in Rapyuta M2T