Making Jarmadeus2 architecture easier