Change default implementation. Closes #181