Hopefully reduces dependencies