public/private locations functionality and management added