Implemented few more Changes to CORE-1236