Changed the database model to include a line class.
Merge
Fixed bugs of new database