Updated Text Domain and Class format