Updated Mock interfaces