Feature/table prefixing

Includes changes for Validation requirements, as well as table prefixing.