Update bootstrap - from static to non static methods. Add annotations