Updated to conform to latest bindster-amorphic changes