Add ArrayParameter types and cleanup SelectorParameter