Refactor
Parse objects as values