Add Alternative instance, fix imports