Adding 'KolichCommon' specific closure entity support