Improve properties table