Updated few more changes to CORE-433