enhance
sql model refactor