Full functionality with new library structure