Updating code to make usages