Changed components to encode inline within objects