Moved data from collection directive to service