Improved structure and implemented basic roster