Added user policies and fix on collection labels