Fixed setup parameters to fit package structure