Removed compartmentalization into action for now. Added support to decorate array.