Fixed dependencies, added zombie & dead accessors