Added safety checks to allow for addition languages