Addint 'collection: false' support for API consistency, minor refactoring, move validator spec into proper place