Refactoring smaps parsing logic