Updating to be compatible with CQ 5.5