Updated internals a bit