Doing some changes into the Core Project

Change-Id: I44f54efb7faa8c4214f069b169154e2c0e4f2c82