Added preliminary composer support