Further flushed out entry design