Initial commit extended