Fix soap classes