Added Screen Manager support