Updated for v1.0-beta version