Modified the Capability parameters to be really ObjectNodes. They need to be anyway.