Work on the refactored Sql component