Added display and language class