General: Added code