Add lib, some classes