Updated to support testing