Made into bundle and added interface factory.