Add more copy

See #164