Moves to properties to improve stability.