improvemtents based on code review
addine extension support