Initial refactor to work with AFNetworking 2.0 version