Fixing and cleanup
Fixing API usage