refactored Model package features (Collection, Query)