Added more extensions
added cmake stuff