Updated policy parser