Adding back some analysis libraries