Avalanch of changes to support / improve external Components and Custom Field Types