Reworked base implementation

Applies the concept rework to the base implementation.