Rewrite of Entity Command Suite