[internals] Reworking some of the internals