Changed to actual types and re-did FindAll scripblock