Added module 6 and 7 with generic interfaces