Updated Screen class