Added database / ORM & command line utility