All functionality added v1.0