Moved locations to custom node type.