Finishing the inner classes