Made BasicHandler generic