Added full_name + some doc