Updated rectangle and circle classes