Changed to not exclude non existant properties