Fixed fatal crash due to array sizes from Configurable.
Cleanup. Fix fatal crash and use configurables.