JRH: Adding more entities