Major update with support for value definitions and comments