Added more params
Moved some confinements to Python controller