Changed factory to a simple class, moved "lookup" to browser