Requested columns added #153 & foreign key changes