Feature/ext code