Modern code style
Added new extensions