Made parsing more uniform