A simple move for now to keep it simple, the breach of abstraction will be resolved in a latter commit.