Added more prperty types and wildcard checking