Code refatored and added new textdomain