Fix services to use shortcut method for primary key and foreign keys.