More hard coding removal