More checking and backwards compatibility