Reverted some changes and fixed interface from PolicyObject* to int