Feature/compose mvq optimization