Resolve bug on command, add system of emote and add getter on DataSource