Updated for use with module builders