API change for cleaner *Skip* classes
fine tuning of #141