added new classes to refactor for android