Start work on CDI support