Additions for first fork of the project