fixed #2 - Updated structure