Next code improvements