Add additional helpers