Refactor, allow fk to be left out, 0.7.8