Added handlers and some other updates