Added: some stuff support