Updated to include different types of usages