base object ref to Observer and Handler

Added base object eference from dictionary, removed hacks