Add support for short words