Added bootstrap and query