created new classes for expansion
added add unit test