Added static liquid support