Decouple markup package from content
Reduce coupling with collections