#3 Improve cad parsing
#3 Update database file