Continue design changes to address issue #47