Minor structural Updates