Added library (among other things)