add where function and new classes