Use more immutable values