Add extra validation