Added comments collection, pub.sub and fixtures