Added type to constructor for validation