Added logging framework
Fixed validator