Adding Pilicy management
fixing conflixts