Added better indentation.
Support querying for more device properties.