Updates to make this work with community engine.