Added library support. What other functions should be used?