Fixed variable/entity design a little