Added Contracts and Facades