Added keepalive and screenlock