Changed outputdir
Added service methods
Removed unused import