[IMP-dev] Change constructor argument orders