Cleaned up framework loader