Added handlers and interfaces clases