Should add etc be constants somewhere?