Refactor properties processing