Added manager windows compatibility