Added CommandHandling and roll command