ADDED: Class Implementation