Fixed and cleaned up assembly creation