Change in SAM structures for better use