Clean up and add support for raw monitor