Make implementation a bit less intrusive