Improving cloudcatcher modularity