Introduced missing functionality