Class and member functions added