fix(collection): Collection directive adjustments