Housekeeping for mockup added