customize setup
changes
Merge branch 'feature/more_generic_fk'