Major updates to AbstractedPolicy