Updated components file