Small changes to start analog support