Tweaked library API