Added some extensions
refactoring