Updated to use `an` module
Removed bundle