Removed use of longjmp
Made some extensibility changes