maty - stack change to extend resource and remove null checks

maty - Stack extend resource and removed null checks