Better parsing logic + parsing invidual keys