Add some changes to adjust the character extension for redability