Domain primary keys match to diavgeia api + some schema fixes