Extra validation logic