Updated for Unified Library

Added methods for Unified Library
Cleaned up code