Add factory to override default