Updated for use with the maven module