Updating with latest changes
Updated with a handlers