Updated to support Maven