Updated to remove wildcard