added corebundle and entity