Added TODO for fixing the creation of members