Added prefixed names handling.
Final Beta version ready !