Importing some more changes from Junjie

More handler adding.....