Converted to use maven