Complete Component add and modification