Feature. Adding validation code