Adapted to recent param file changes