Refs #111 - Table enhancements