Updated to new recommended structure