Added check for creation