Feature/osf integration