Added features for platform integration