Added EN and support for mandatory