Refactored and added included ext