Using an interface for Prepare like it was done for Output
Updates
Merge branch 'master' into develop