Moved handlers to FX subpackage