Added library handler