Clean up config and support array inheritance