Added system detection