Used msf file mixin where possible and more in memory handling