Updated for a Base that does not export 'Base'.
Temporary commit.