Fixed a bug during registration.
Refactored classes.
Optimized concatenation.