Add inject methods instead of constructor injection + add shutdown hanlder