added parsing and value store logic