Added new lib classes