Additional pod parameters + small refactoring