Updated comments

Change dispatch behaviour - always return callable structure (class or function)