Stop overwriting the static methods
Fix the relation lazy setup