- Added policy functionality