Seperated into subpackage for future dogfooding