Updated files to be more robust; Added new packages