Updated custom validation