Some extra validation