Updating code based on Cloudera's CDH 4.5.0