Simplify components to be plain maps

by @jordangarcia