Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Update framework