Created new classes according to design