Added library support