Made basehandlers work