Feature/custom entity bundle