Added count property to tables