AS7-6344 Include system level in layered structure