Added ubiquitous layer support.