Enable previous implemented Features

Change-Id: I2b0496a46c23a8debcc2b85e229ecbbe7c02a2e6