Disablity support

In the preparation.