Improve InnerModel SUpport (still some work to do)
Fix #58 in beta mode - Some refactoring is still pending