Entity bundle and other small changes