Hopefully better entity design - i.e. one that works properly