More work on CardComposer