Fixes, added some static endpoint implementations