Changed locked default to false and added get/set-ters