Some Features Added