Remove jtlCore dependency
Update to reflect the latest entity changes