Implemented untested changes to facilitate styleguide and sidecar fields