Added custom injectable.
Fixed some return types.