Added bundle, entity, persistence