Added RoboJuice 3 support
Little refactoring