small fixes added to DB structure to support one-to-one relationship