Feature/single collection inheritance Apr 17