Port the latest changes (loading improvements)

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>