Revert back to using synchronized methods