Move expand to general utilities