Start of work for new adapter based structure