Changed library setup