Added handlers as well as modifications to install