Added common models
Improved source files