Updated to use new gem