Added base sourcehandler code