Add support for disabled state, images