#90 dependencies moved and validation fixed