Added control acronym support;