Refactored context specific providers to util classes.