Added upper case letter support