Further design changes for upcoming 0.9 release