Add HAS and HAS NOT & better array support