Refactored dispatcher & registry building
Removed custom interface
Fixed settings