Added commands parsing. TODO: Check if everything works !