Added Analysis support