Added uppercase letter support