Added entities and some experimental shell commands