Improve implementations