Move to common-java