Moved from prototype-type class to Java-like