Modified version of class declaration