Java friendly changes