Make more things components