modularize property table stuff