Updated Master with framework