Adding frameworks back to master