Modified to run under code4lib