S3 model enhancements

[silviuburz]

I implemented the "fields automatically creating relationships when a matching class is found" feature and I performed some additional refactoring work and cleanup with the tests. No major functionality changes