Updated to v 0.9.0 with merged updates from classes