Revamped the Handler System with the help of X-logic