Refactored to use new experimental module approach.