Added several new classes in model and database package