Adding in more entities