Completely restructured version to adapt to new oxide module logic.