Updating common to remove Java 8