esql_model: Several design modification after some thoughts