Added support for layer 18