Updated: Removed static instances