Added diagrame after some cleanup work