Added necessary libraries again