Fix: Code now based on the Maven sources