Massive update with completely rewritten library