Refactor classes after merge
Criteria statement log added
add types