Added remaining handler files