Base classes update