Generic types refactoring
Adding IN clause functionality
Adding BETWEEN clause functionality
Merging changes