Added validation and added local files for libraries