Automation improved + Common constants shared between server and client