Make project a little bit universal