Updated api simplification and documentation updates