Added structure for testing