Completly get rid of the aware interfaces? I know, you're not a fan of aware interfaces because of the lazy loading restriction ;)