Application Logic updates