Changed Abushahir instance methods to class level methods