Removed the 'static' keyword from the location assistant and the statement assistant and made classe that depend on these assistant reflect these changes