Reworked library