Fixed require dependencies in models & collections