More SlimPIE stuffs

Change-Id: I2c3f5f23909f746e1a325be81ec4c3ec83e26568