Updated Entity

Further flushed out Entity