Moved maui handler in library