Refactored 2.4 and earlier commands to use prototype