Basic Entity - fix for CI