Added Resource and Table wrappers to allow customization