Cleanup
Small refactoring RelatedQuerySet
Add fk support
merge