Adding content length check