Adapted to work with changes due to modules. Still using the first type
of the file, though.
Changed by maven