Finish sql class design