Included CoFHAPI + added RF support