Refactor to move constants into IBPLConstants