Changed interface to policy handlers, slightly