Rewritten utils unterfaces & internals