Updates to data class to allow use of "TABLE_PREFIX"