Added searches for variables