Added history tracking and server side resources