Adding validation for queue - removed from own package