First draft with composer support