Refactor: Extract data out of composer