changed database structure and dal classes to support Uniqueid