Added potential future implementations