Minor commit - Structural changes