Improve backend validation