Added mockup code for issue #7