Fixed base_handler import