added compatibility with all property types