Merge "Added Layer 2 Types model"