FIX: Nested imports + misc. API modifications