Modifications for proper installation