Framework for Monuments and few small changes