Changed return type of analog class