Moved collections into decorator instead of yaml config; need more specs for collections