updated forward declaration of class command
made proper update of class command