Move dependencies out of framework for Om