Added lint, coverage support