Add monebox handler
Add some fixes