Modified for reflection to the changes made int cwt-core.