Updated to add latest configurations