Changed methods signatures to public