Moving from Platform/Decorator to new Sql class implementation