Adjust return statuses and add timeout option