Should these be defined in @variables?