Fixed source parser and implemented it