Updated to work with new structure
Updated for 0.2.0