Updated Helpers