In order to sync structure and dependencies.
Fixed parsing alphanumeric variables and added number parsing.