Minor Commit - Structural changes