Maven improvement