Updates to processing logic