- adding WHERE clause has been moved under condition of there's been a SELECT statement
- addConstruct method has been implemented and tested