Refactor parseobjects