Updated to use structure from master