Added check for string data
Added com.ua template