Included libraries and removed some dependencies