Moved dao to extra folder
Support #contains() for array fields