Improve properties and devices tables