modified org handler to save component data