A few helper options added