Replace Compose with Factory