Adding back External Layer capability