Added more custom libraries in