Feature/automation improvements