Added some libraries and functiionality