Fix CS and integrate composer