Changed classes in lib to have inheritance
Merged