Updates structure and added more commands