Restructured command class