Introducing Share Type and adding Code Changes