Additional work on modeling structure