Some improvement to /create