refactor over
now most select statement will be available