Object model more Java friendly