cleanup
baseUrl improvement
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  baseUrl improvement
  cleanup
added posibility to set all type of fields of collections as required