Some design changes and adapter changes