Added non-const machinery