Updated for better maven compatiblity