Removed dependency on bkcommonlib!