Refactoring SQL.Build and SQL.Entity