Updated to use Nape 2 (2.0.3 swcs added)