Added Space compatibility

.