Fixed: Parse instead of building at startup
Little optimization