First automation improvements