add amt custom configuration and some tweaks