Added SERVE parsing, more checks