Implementing support for different OS bases

Related to #35