API consistency (#18)