Small tweaks to entites and schemas